fix-rust_uno-path-for-cargo-wrapper

===================================================================

Gbp-Pq: Name fix-rust_uno-path-for-cargo-wrapper.diff

diff --git a/rust_uno/Extension_rust_uno-example.mk b/rust_uno/Extension_rust_uno-example.mk
index d0ee22a657d767535cf86fabc91fa4b447115053..140a3e1c41ef7591ab8d949c9936940b9d860b1a 100644 (file)
--- a/rust_uno/Extension_rust_uno-example.mk
+++ b/rust_uno/Extension_rust_uno-example.mk
@@ -14,13 +14,13 @@ $(eval $(call gb_Extension_add_file,rust_uno-example,platform.components,$(call
 $(eval $(call gb_Extension_add_files,rust_uno-example,, \
     $(SRCDIR)/rust_uno/example/Addons.xcu \
     $(SRCDIR)/rust_uno/example/ProtocolHandler.xcu \
-    $(SRCDIR)/rust_uno/target/release/$(if $(filter WNT,$(OS_FOR_BUILD)),rust_uno.dll,librust_uno.so) \
+    $(SRCDIR)/rust_uno/target/$(DEB_HOST_RUST_TYPE)/$(CARGO_CHANNEL)/$(if $(filter WNT,$(OS_FOR_BUILD)),rust_uno.dll,librust_uno.so) \
 ))
 
 $(eval $(call gb_Extension_add_libraries,rust_uno-example, \
     rust_uno-example \
 ))
 
-$(SRCDIR)/rust_uno/target/release/$(if $(filter WNT,$(OS_FOR_BUILD)),rust_uno.dll,librust_uno.so): $(call gb_CustomTarget_get_target,rust_uno/cargo)
+$(SRCDIR)/rust_uno/target/$(DEB_HOST_RUST_TYPE)/$(CARGO_CHANNEL)/$(if $(filter WNT,$(OS_FOR_BUILD)),rust_uno.dll,librust_uno.so): $(call gb_CustomTarget_get_target,rust_uno/cargo)
 
 # vim: set noet sw=4 ts=4:

diff --git a/rust_uno/Library_rust_uno-example.mk b/rust_uno/Library_rust_uno-example.mk
index 42cd1b6ba8f4a664f38c28510a8fa5312d1f6fe3..77d7ed931385b13bf42ad2a399dde89157bc0f39 100644 (file)
--- a/rust_uno/Library_rust_uno-example.mk
+++ b/rust_uno/Library_rust_uno-example.mk
@@ -42,7 +42,7 @@ else
         -Wl$(COMMA)-rpath$(COMMA)\$$$$ORIGIN \
     ))
     $(eval $(call gb_Library_add_libs,rust_uno-example,\
-        -L$(SRCDIR)/rust_uno/target/release -lrust_uno \
+        -L$(SRCDIR)/rust_uno/target/$(DEB_HOST_RUST_TYPE)/$(CARGO_CHANNEL) -lrust_uno \
     ))
 endif